(P_): Don't define if already defined.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index ff9da7199241ebb3b04728b4b0ed0494515e485f..f3cbbe51454095feeab18df39456380356ef1231 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * lwlib.c (P_): Don't define if already defined.
+
 2002-01-27  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * lwlib-Xaw.c (xaw_update_scrollbar, xaw_scrollbar_scroll)

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index bf542f36f5287f64a76de72ff6170acfb1d4d8fe..f7e68925c9c338fd2ed153485273cb190b2027ea 100644 (file)
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -75,11 +75,13 @@ char *lwlib_toolkit_type = "motif";
 char *lwlib_toolkit_type = "lucid";
 #endif
 
+#ifndef P_
 #if defined __STDC__ || defined PROTOTYPES
 #define P_(x)  x
 #else
 #define P_(x)  ()
 #endif
+#endif
 
 static widget_value *merge_widget_value P_ ((widget_value *,
                                             widget_value *,